From d85cf94621ab3531828430b0b50f860d0ff81887 Mon Sep 17 00:00:00 2001
From: "kfraser@localhost.localdomain" <kfraser@localhost.localdomain>
Date: Sat, 23 Sep 2006 14:07:41 +0100
Subject: [PATCH] Move initialize_keytable declaration to keyhandler.h

Signed-off-by: Aron Griffis <aron@hp.com>
---
 xen/arch/ia64/xen/xensetup.c | 1 -
 xen/arch/powerpc/setup.c     | 3 ---
 xen/arch/x86/setup.c         | 3 +--
 xen/include/xen/keyhandler.h | 3 +++
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/xen/arch/ia64/xen/xensetup.c b/xen/arch/ia64/xen/xensetup.c
index 12c6850aa7..4b9095c38d 100644
--- a/xen/arch/ia64/xen/xensetup.c
+++ b/xen/arch/ia64/xen/xensetup.c
@@ -38,7 +38,6 @@ extern unsigned long domain0_ready;
 int find_max_pfn (unsigned long, unsigned long, void *);
 
 /* FIXME: which header these declarations should be there ? */
-extern void initialize_keytable(void);
 extern long is_platform_hp_ski(void);
 extern void early_setup_arch(char **);
 extern void late_setup_arch(char **);
diff --git a/xen/arch/powerpc/setup.c b/xen/arch/powerpc/setup.c
index eb75a30bd4..83c0aca028 100644
--- a/xen/arch/powerpc/setup.c
+++ b/xen/arch/powerpc/setup.c
@@ -87,9 +87,6 @@ struct ns16550_defaults ns16550;
 
 extern char __per_cpu_start[], __per_cpu_data_end[], __per_cpu_end[];
 
-/* move us to a header file */
-extern void initialize_keytable(void);
-
 volatile struct processor_area * volatile global_cpu_table[NR_CPUS];
 
 int is_kernel_text(unsigned long addr)
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 6507d6fa86..e21b4c2370 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1,4 +1,3 @@
-
 #include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
@@ -16,6 +15,7 @@
 #include <xen/gdbstub.h>
 #include <xen/percpu.h>
 #include <xen/hypercall.h>
+#include <xen/keyhandler.h>
 #include <public/version.h>
 #include <asm/bitops.h>
 #include <asm/smp.h>
@@ -81,7 +81,6 @@ extern void arch_init_memory(void);
 extern void init_IRQ(void);
 extern void trap_init(void);
 extern void early_time_init(void);
-extern void initialize_keytable(void);
 extern void early_cpu_init(void);
 
 struct tss_struct init_tss[NR_CPUS];
diff --git a/xen/include/xen/keyhandler.h b/xen/include/xen/keyhandler.h
index ba443ae48f..451b4c3345 100644
--- a/xen/include/xen/keyhandler.h
+++ b/xen/include/xen/keyhandler.h
@@ -10,6 +10,9 @@
 #ifndef __XEN_KEYHANDLER_H__
 #define __XEN_KEYHANDLER_H__
 
+/* Initialize keytable with default handlers */
+extern void initialize_keytable(void);
+
 /*
  * Register a callback function for key @key. The callback occurs in
  * softirq context with no locks held and interrupts enabled.
-- 
2.30.2